Merge "[sf] HdrOutputControlTest: fix strategy arguments" into main am: e3af352da5

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

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