Merge changes from topic "am-ca006b49c781433a98b70cd175d5cbd7" into udc-dev am: 3ea6b91c

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



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