Merge changes from topic "am-13ae750ccefb488f9ca94938517ccf87" into udc-dev...

Merge changes from topic "am-13ae750ccefb488f9ca94938517ccf87" into udc-dev am: ea0a034c am: d67ae58b

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



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