Merge changes from topic "am-883be6b5e9e94d0995e6b3e7d430600a" into...

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