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

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

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



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