Merge changes from topic "am-243784469ce24c0b97637c722c0dbb61" into...

Merge changes from topic "am-243784469ce24c0b97637c722c0dbb61" into udc-d1-dev-plus-aosp am: ddcda50a -s ours

am skip reason: Merged-In I4ef415437568ae165ac5a3153d18bd2e2ef1f808 with SHA-1 69f9efe5 is already in history

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



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