[automerger skipped] Merge "DO NOT MERGE ANYWHERE Ignore failing test" into rvc-dev am: 21e30f6450 -s ours am: 7ff9d3ecb5 -s ours am: a8cd6dcec5 -s ours am: 51f73e2c0e -s ours am: e44b4feedc -s ours am: 78342c1398 -s ours am: bf65d1ae40 -s ours am: 5b7431d943 -s ours am: a73bbfe185 -s ours am: 8528ab641c -s ours

am skip reason: contains skip directive

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

Change-Id: I63965e70db7de94522f9bd4fb1cf1c02867ea157
Signed-off-by: Automerger Merge Worker <[email protected]>