Merge changes from topic "revert-23316821-WWTNIVUOBO" into udc-dev am:...

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

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



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