Merge changes from topic "am-3cc96f95c6a14511bf2fb86b3c05dc4c" into...

Merge changes from topic "am-3cc96f95c6a14511bf2fb86b3c05dc4c" into tm-qpr-dev-plus-aosp am: 0f1c048a -s ours

am skip reason: Merged-In I86f8372c7de8234f5f1dd941dbf1c9eb9fbef647 with SHA-1 5b9c3bf2 is already in history

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



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