Merge changes from topic "am-b6907c13d4c64147af79f09d46c90a0d" into...

Merge changes from topic "am-b6907c13d4c64147af79f09d46c90a0d" into udc-d1-dev-plus-aosp am: 6ea790a9

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



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