[automerger skipped] Fixed failing scrim test am: ac3e13a8 am: 4850cb8d...

[automerger skipped] Fixed failing scrim test am: ac3e13a8 am: 4850cb8d am: 4f0d1227 -s ours am: 7ff78097 -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: Ie0460e87118d86740ae0b9cbf610a9883646e1b0