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

Merge changes from topic "am-13ae750ccefb488f9ca94938517ccf87" into udc-dev am: ea0a034c am: 83f09354 am: 5b3acf69 am: 3b160bfa

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



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