Merge changes from topic "am-869a3b3349254398bc01076014809787" into tm-qpr-dev-plus-aosp am: 4ca92a34 -s ours

am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 c4b2c877 is already in history

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



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