[automerger skipped] Fixed failing scrim test am: ac3e13a89c am: 97f9823318 -s ours
am skip reason: Merged-In Ib9216246b9eb05b664d4f88f8cf6d11cc58e32d6 with SHA-1 ac3e13a89c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15663082
Change-Id: I31069ca1e4698241e9fe3663794775e0f504611b
This commit is contained in: