Merge changes from topic...

Merge changes from topic "revert-23118164-revert-23033485-WUUYRIDOOG-NYHTCROJNY" into udc-dev am: 766f7509 am: 7d3a3ac4 am: 14a741f5 am: 7b481f1e

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



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