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

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

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