Merge changes from topic "am-746e383606224e66807994d8d251cd0b" into...

Merge changes from topic "am-746e383606224e66807994d8d251cd0b" into udc-d1-dev-plus-aosp am: 5e58cca7 am: f29885e5

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



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