Merge "Composition strategy prediction: Make broader predictions." into tm-dev am: d0f7b15b

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



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