Merge changes from topic "am-72df0acce0834d81aa8fef7f2caae738" into...

Merge changes from topic "am-72df0acce0834d81aa8fef7f2caae738" into udc-dev-plus-aosp am: a2855c64 am: 3e3733d7

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



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