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

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

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



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