Merge changes from topic "am-11804f48f274487d903efa686c0b408d" into...

Merge changes from topic "am-11804f48f274487d903efa686c0b408d" into udc-d1-dev-plus-aosp am: b6ba0fa9 -s ours

am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 39f57376 is already in history

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



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