Merge "Merge changes from topic "revert-23033485-WUUYRIDOOG" into udc-dev am: c6315897 am: 2bd58e0e am: c179bb00" into udc-qpr-dev-plus-aosp am: 8a782e72

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



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