[automerger skipped] Merge changes from topic "effect_device_mask" into main...

[automerger skipped] Merge changes from topic "effect_device_mask" into main am: 271948af am: 214896b5 -s ours

am skip reason: Merged-In I1854daf8b8ccddaa3f883afb3ddada1be77c3cc3 with SHA-1 c983e67f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3529211



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