Merge changes from topic "am-f95de362129a41dcbb1c7a3b60abaece" into...

Merge changes from topic "am-f95de362129a41dcbb1c7a3b60abaece" into tm-qpr-dev-plus-aosp am: 86ce1e94 -s ours

am skip reason: Merged-In I6ffbb7510e6854f18bc427d1ae1e782918c799dc with SHA-1 15d116ed is already in history

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



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