Merge changes from topic "revert-23316821-WWTNIVUOBO" into udc-dev am: 01b8e815f1 am: fb4e1ac646 am: 587c8ce317 am: 8acf309fdd

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

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