Merge changes from topic "am-53c3b0affc65494099f337135a6c6b3e" into...

Merge changes from topic "am-53c3b0affc65494099f337135a6c6b3e" into udc-d1-dev-plus-aosp am: 885a6a1e

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



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