Merge changes from topic "cherrypicker-L08900000961397789:N72700001380319289"...

Merge changes from topic "cherrypicker-L08900000961397789:N72700001380319289" into udc-dev am: 56a6e007

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



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