Merge changes from topic "am-867d35e050e24b62a8c1f415e45ad59d" into udc-dev am: b6fa74ea am: 1b7575fd

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



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