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

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

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



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