Merge changes from topic "am-011deab34d514b939715ba9a508e18d9" into...

Merge changes from topic "am-011deab34d514b939715ba9a508e18d9" into tm-qpr-dev-plus-aosp am: c42351eb -s ours

am skip reason: Merged-In I025245b2a6f8cfaca86f268851a9d8f0817e07dd with SHA-1 d54a48f4 is already in history

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



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