Merge changes from topic "am-edcc3de9c5204857944c7efee726b409" into...

Merge changes from topic "am-edcc3de9c5204857944c7efee726b409" into udc-d1-dev-plus-aosp am: a4de6764

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



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