Merge changes from topic "am-e543145f59ae430f9d6da8f1e7dddd71" into...

Merge changes from topic "am-e543145f59ae430f9d6da8f1e7dddd71" into udc-d1-dev-plus-aosp am: f81d8f7f

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



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