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: I6b3bb3e7f44276a59b3ef88fcc6bed089bc32444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>