Merge changes from topic "am-cf421821fa0143fcba5fc7d1d42889f6" into udc-dev am: 240c3926 am: c4ffe093

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



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