Merge changes from topic "am-2fe8edddf77a4f32803433e98b5995df" into...

Merge changes from topic "am-2fe8edddf77a4f32803433e98b5995df" into udc-d1-dev-plus-aosp am: 4abcc2fd am: 6c4bcd77

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



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