Merge changes from topic "am-9af56d16cfef496aa0460f278b25bf8b" into udc-dev am: 0b728844 am: 556721e5

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



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