Merge changes from topic "am-aa2dce105af24533a6b44361beb23697" into udc-d1-dev-plus-aosp am: bab3120b

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



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