Merge changes from topic "am-13ae750ccefb488f9ca94938517ccf87" into udc-dev am: ea0a034c

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



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