Merge changes from topic "am-340505ec150944a9b88ef5fcec38b52a" into...

Merge changes from topic "am-340505ec150944a9b88ef5fcec38b52a" into udc-d1-dev-plus-aosp am: 1bccab95 am: c4fe3728

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



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