Merge changes from topic...

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

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



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