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

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

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



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