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

Merge changes from topic "am-f9bf013c69904c72af7e445693ed67ac" into udc-d1-dev-plus-aosp am: 7c07970c -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/+/24294454



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