Merge changes from topic "am-8fbea212b3ac45f7b07637ea51b9d605" into...

Merge changes from topic "am-8fbea212b3ac45f7b07637ea51b9d605" into udc-d1-dev-plus-aosp am: be4a8af5 -s ours

am skip reason: Merged-In I39b7bc62d82e20b5ba8747be13a2aa7bf21a59a2 with SHA-1 0c32739f is already in history

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



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