Merge changes from topic...

Merge changes from topic "revert-20711670-revert-20653722-KTBRNWFPCR-ISDAJQEWHM" into tm-qpr-dev am: 6fbc1343

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



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