Merge changes from topic "am-690a757853224cf3afc67ab6aa353037" into udc-dev am: a8e64208 am: 1888bd1d

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



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