Merge changes from topic...

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

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



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