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

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

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



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