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

Merge changes from topic "am-fadbd2ad8d6246cc86edf16a1b20b4d7" into udc-d1-dev-plus-aosp am: fc287538 am: 01e231ab

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



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