[automerger skipped] Merge "[sf] HdrOutputControlTest: fix strategy arguments"...

[automerger skipped] Merge "[sf] HdrOutputControlTest: fix strategy arguments" into main am: e3af352d am: ea63eff7 am: 9e3496b1 -s ours

am skip reason: Merged-In I820ac945113da0317d0eaa44f581fd6ab1b61645 with SHA-1 0dfa358c is already in history

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



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