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 am: 38f0079c

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



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