Merge changes from topic "am-7a2189f970e04579a77f33836cba70a1" into udc-d1-dev-plus-aosp am: bbb94624

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



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