Merge changes from topic "am-0cfea85d15524e6db87ab0b499fc6f2f" into...

Merge changes from topic "am-0cfea85d15524e6db87ab0b499fc6f2f" into udc-qpr-dev-plus-aosp am: 91e32ee6 -s ours

am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a is already in history

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



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