Merge changes from topic "am-8a32ae0b8bb34b8faa8b87206b65e327" into udc-dev am: ceb9af22 am: d77b2a99

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



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