Merge changes from topic "am-714039f3cfd243eb98aff7d30946de12" into...

Merge changes from topic "am-714039f3cfd243eb98aff7d30946de12" into udc-d1-dev-plus-aosp am: 0fcc6ee4 am: 75c62e1b

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



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