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

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



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