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

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



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