Merge changes from topic "am-5dce49a693fb4e549484302b9a98b730" into...

Merge changes from topic "am-5dce49a693fb4e549484302b9a98b730" into udc-dev-plus-aosp am: bdb419b4 am: 4669fd31 am: 38d9421b

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



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