[automerger skipped] Merge "DO NOT MERGE ANYWHERE Ignore failing test" into...

[automerger skipped] Merge "DO NOT MERGE ANYWHERE Ignore failing test" into rvc-dev am: 21e30f64 -s ours am: 7ff9d3ec -s ours am: a8cd6dce -s ours am: 51f73e2c -s ours am: e44b4fee -s ours am: 78342c13 -s ours am: fc7d7020 -s ours

am skip reason: contains skip directive

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



Change-Id: I20f0cf8eeb8a952f154d9d4c4bac571c767fbff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>