Merge changes from topic "am-5e4f3119099c4423b7ccf4fd14920428" into udc-dev am: 50ff7b83

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



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