[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: Merged-In I3c2b718905d2d7619d6f299ee5402fd858de030e with SHA-1 80005cd6 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I6e8713398f0314e309316966c54d13b325e49743