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

Merge changes from topic "am-a1eded266dfd4d31b9a5b52f97bed543" into udc-d1-dev-plus-aosp am: 167c4a2d -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: I35a9bd61ea5239ef9bf917bb9e587c36f29104b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>