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

Merge changes from topic "am-caf86fd962d447f18a017351ee55e45c" into tm-qpr-dev-plus-aosp am: 7d532bc7 -s ours

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

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



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