Merge "Fix TunerFilterSetting union usage" am: 4b63204bec am: 20e893dd09

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

Change-Id: I4b9ab3f8d847851beb7f599af60d8da53163d9bb