Merge changes from topic "am-e95e7e092a7d468695cf89bca2deb6a6" into udc-dev am: c35487e6

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



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