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

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



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