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

Merge changes from topic "am-db1dfd5239b74dd8bfaf62d752d876ae" into udc-qpr-dev-plus-aosp am: 00fb1275 -s ours

am skip reason: Merged-In I80322ff296661972a442d799812751d5411b665b with SHA-1 e0da2909 is already in history

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



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