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

Merge changes from topic "am-3dbcf1e334e4452aa574b3fd5eec826a" into tm-qpr-dev-plus-aosp am: b723be33 -s ours

am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 7c38394a is already in history

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



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