Merge changes from topic "revert-23033485-WUUYRIDOOG" into udc-dev am: c6315897 am: 64cd8f48 am: 8ccfe1d4 am: cb3b8ef4

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



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