Merge changes from topic "am-91574e3018fa4212a543a4b0089221fd" into udc-dev am: f928657f am: 6193d4de

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



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