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

Merge changes from topic "am-e5f8cd7888d240c0af2d475a6e283d47" into udc-qpr-dev-plus-aosp am: 00107e0b -s ours

am skip reason: Merged-In I720699093d5c5a584283e5b76851938f449ffa21 with SHA-1 b38e1e5a is already in history

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



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