Update shiba SVN to 13 am: c2af899c7b am: b4707473d1

Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25620331

Change-Id: I801d992de9905e85aec49b6b1ea3e0bd7d1564e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>