Merge changes from topic "am-bd6de0ae8590435cb9e3a62065166165" into udc-dev am: 30052619

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



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