Merge "Make UMO squishy in split shade" into tm-qpr-dev am: 102c1454

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



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