[automerger skipped] Merge "Composition strategy prediction: Make broader...

[automerger skipped] Merge "Composition strategy prediction: Make broader predictions." into tm-dev am: d0f7b15b am: 361b89c1 -s ours

am skip reason: Merged-In I1f41e2cc67b1b55780e1bf6e837d766b4c186161 with SHA-1 0a2c43c7 is already in history

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



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