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

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

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



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