Merge "Revert "Make UMO squishy in split shade"" into tm-qpr-dev am: f34df80084

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

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