[automerger skipped] Merge "DO NOT MERGE ANYWHERE Ignore failing test" into rvc-dev am: 21e30f6450 -s ours

am skip reason: contains skip directive

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

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