[automerger skipped] Merge "DO NOT MERGE Ignore test that is failing on...

[automerger skipped] Merge "DO NOT MERGE Ignore test that is failing on tm-qpr-dev" into tm-qpr-dev am: 7b7f24a0 -s ours

am skip reason: subject contains skip directive

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



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