[automerger skipped] Fixed failing scrim test am: ac3e13a8 am: 97f98233 -s...

[automerger skipped] Fixed failing scrim test am: ac3e13a8 am: 97f98233 -s ours am: b1d63e62 -s ours am: adbe7bb8 -s ours

am skip reason: Merged-In Ib9216246b9eb05b664d4f88f8cf6d11cc58e32d6 with SHA-1 baa03325 is already in history

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

Change-Id: Id683b749da18265fb00e110e9bf5211c03dce28c