Merge changes from topic "am-b294cc98c84e4a4d9e436ce8fd23c783" into udc-dev am: 4b1ea9c2 am: 71e62cb4

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



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