Merge changes from topic "am-35563c9c679444148ec0d83211a4c15d" into...

Merge changes from topic "am-35563c9c679444148ec0d83211a4c15d" into udc-dev-plus-aosp am: 5a85e62b -s ours

am skip reason: Merged-In I08b16ba1c155e951286ddc22019180cbd6334dfa with SHA-1 42557cb5 is already in history

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



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