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

Merge changes from topic "am-e88a4e75a6a14472ad8ea35e4b6d17c7" into tm-qpr-dev-plus-aosp am: 5b538369 -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/+/19205942



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