[automerger skipped] Merge "Fixes various failing cts" into sc-dev am: aa3477c5 am: 78cdfe77 -s ours

am skip reason: Merged-In I9b0156c62c47f848400b2cd85548a1b8d246a68c with SHA-1 b8726455 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13513296

Change-Id: I717173d3f821d0211dd29f554b62946469171a13