Merge changes from topic...

Merge changes from topic "revert-19436880-revert-19279477-UFVLVIEMJU-NPEBAMHHJM" into tm-qpr-dev am: 1e8d8026 am: fe9e929f

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



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