Merge "SF: Predict HWC composition strategy" into tm-dev am: e758e365f6 am: f183c23592

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

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