Merge changes from topic "am-852601dff0e54495a0a1120c5d53cc87" into...

Merge changes from topic "am-852601dff0e54495a0a1120c5d53cc87" into udc-d1-dev-plus-aosp am: 40f315e0

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



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