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

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



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