[automerger skipped] Merge "Disable the test (1/n)" into rvc-dev am:...

[automerger skipped] Merge "Disable the test (1/n)" into rvc-dev am: d994d146 am: d793b339 -s ours am: 58a85e07 -s ours am: 2ffdbbf5 -s ours am: 04ea4d5c -s ours am: 0f276174 -s ours

am skip reason: Merged-In Ibb921b8e718c5c9cd86c5580010cb163125d8fae with SHA-1 50aa93d6 is already in history

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

Change-Id: I603d3b721700f5f5bafb21273dd08ba62ea033d2