[automerger skipped] Merge changes from topic "revert-21485850-AFHEQKBZWB"...

[automerger skipped] Merge changes from topic "revert-21485850-AFHEQKBZWB" into tm-qpr-dev am: a7757c3b am: e913f676 -s ours am: c4d91fb7 -s ours

am skip reason: Merged-In Id4a6dd22708ddee38dd6c10ceb6c81f6a7bfb44f with SHA-1 9c630e36 is already in history. Merged-In was found from reverted change.

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



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