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

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

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