Merge "Optimistic fix for tile not getting redistributed in split shade" into...

Merge "Optimistic fix for tile not getting redistributed in split shade" into tm-qpr-dev am: 8d6cb658 am: 23208bc7

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



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