Merge changes from topic "am-096dde419b89427988377c6c2dd9480c" into udc-dev am: 0b5e5e38 am: cac54bb9

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



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