[automerger skipped] Merge "Fix TunerFilterSetting union usage" am: 4b63204b...

[automerger skipped] Merge "Fix TunerFilterSetting union usage" am: 4b63204b am: 20e893dd am: c02e8001 -s ours am: 6af028fd -s ours am: f95ac692 -s ours

am skip reason: Merged-In I8400fd75080971ee897e1e2dc35e2bab45ec1659 with SHA-1 eae68393 is already in history

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

Change-Id: I4aaa8daf98b6fdb1d2e35e7f42fcfe12febb0fa4