Merge changes from topic "am-70d1989cf78d41b9aa386b30d2279168" into...

Merge changes from topic "am-70d1989cf78d41b9aa386b30d2279168" into udc-qpr-dev-plus-aosp am: 1664a8fd -s ours

am skip reason: Merged-In I94f5a9a4313c13375062fdade0e672d51eb5dc55 with SHA-1 74d9576b is already in history

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



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