Merge changes from topic "am-63e107c44be7448a8490613d3787ca44" into...

Merge changes from topic "am-63e107c44be7448a8490613d3787ca44" into udc-d1-dev-plus-aosp am: 18845dfc -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/+/24343150



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