Merge changes from topic "revert-23316821-WWTNIVUOBO" into udc-dev am: 01b8e815f1

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

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