Merge changes from topic "am-5b55b13a30a4482fa3243193fdd1268f" into udc-dev-plus-aosp am: 529e2a5a

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



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