Merge changes from topic "am-e9c315f5ba0c4dac88e5029206d947f9" into udc-d1-dev-plus-aosp am: dadb3ee5

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



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