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

Merge changes from topic "am-a928ff36c77e4f0eb02dd490b1d820e5" into tm-qpr-dev-plus-aosp am: a99a8bf7

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



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