Merge changes from topic "am-357fc7603d464176949fe70560788ae2" into...

Merge changes from topic "am-357fc7603d464176949fe70560788ae2" into udc-dev-plus-aosp am: a9f06ea7 am: 934db2ac

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



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