Merge changes from topic "am-8ad6c9befff04f07a8c50797c21df734" into...

Merge changes from topic "am-8ad6c9befff04f07a8c50797c21df734" into udc-dev-plus-aosp am: 16444205 -s ours

am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 658ed370 is already in history

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



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