Merge changes from topic "am-2472d72054c44ea490577c83dbdd7020" into udc-dev am: 590c89ff -s ours

am skip reason: Merged-In I09d64452c46c4d21b9d958570020b2f5e6c2b23f with SHA-1 cb2904c7 is already in history

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



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