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: I9f2e48092ebc1f48239518d7e4aa192cfbbdab0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>