Merge "SF: remove unused variable on chooseCompositionStrategy." into main am: ed022f7bbc am: 9a465c72d8 am: eab0f58fe9

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

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