Merge changes from topic "am-6f9e4022de18455493ebda8b0cfe7548" into...

Merge changes from topic "am-6f9e4022de18455493ebda8b0cfe7548" into udc-d1-dev-plus-aosp am: 4ff2a8fd am: b11a1dda

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



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