[automerger skipped] Merge "[DO NOT MERGE] Revert "Backport of ag/14170751 and...

[automerger skipped] Merge "[DO NOT MERGE] Revert "Backport of ag/14170751 and ag/14170752."" into rvc-qpr-dev am: 339805fb -s ours am: 05c999d6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5e1b15b44e877c01358d6692e734f0c23ace8a92