Merge changes from topic "am-0b98400b279540e19400f91e4a096599" into udc-d1-dev-plus-aosp am: 4b2d887d

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



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