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