Merge changes from topic "am-45dcf234bff848e887d950e4ed1dadd5" into udc-d1-dev-plus-aosp am: 625b8a41

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



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