Merge changes from topic "am-e478d7b730b1412999ee2f89293b40ce" into udc-dev-plus-aosp am: 13595b77

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



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