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

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

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

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

Change-Id: Ifefe15861c9cfd69faed1785377027208d6b5cce