Merge changes from topic "am-21056bd30e974518b1217157ea18f6d9" into...

Merge changes from topic "am-21056bd30e974518b1217157ea18f6d9" into tm-qpr-dev-plus-aosp am: 8040b7e1 -s ours

am skip reason: Merged-In I3d46e46db888bcf5a54faa009d96ce53611ca077 with SHA-1 29934060 is already in history

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



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