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

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



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