Merge changes from topic "am-69bbabe4aa46467eb85a40ee75080959" into...

Merge changes from topic "am-69bbabe4aa46467eb85a40ee75080959" into udc-d1-dev-plus-aosp am: 4f2fe7ee

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



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