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

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



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