Merge changes from topic "am-17b06408381142599579982fd9ff2382" into...

Merge changes from topic "am-17b06408381142599579982fd9ff2382" into tm-qpr-dev-plus-aosp am: 51f16b15 -s ours

am skip reason: Merged-In Ic085c6ed134c2787a26fd2b02b4345b04fb693e6 with SHA-1 73774c26 is already in history

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



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