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

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

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