Merge changes from topic "revert-20653722-KTBRNWFPCR" into tm-qpr-dev am: 3e9699a2 am: b8f2da3c

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



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