Merge changes from topic "am-90a36cc8c1ce4caa832bc51475836fc4" into...

Merge changes from topic "am-90a36cc8c1ce4caa832bc51475836fc4" into udc-d1-dev-plus-aosp am: 445f35c9 -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: I477457ffe7757162cde12cfd7f1eee3329a5c827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>