Merge "SF: Enable HWC composition strategy prediction" into tm-dev am: 656a4684 am: ef653413

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



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