[automerger skipped] Add additional DVBT settings to TunerTestingConfig am: 8fa4cff4ce am: 86d8d2caf2 am: f6a0ed5136 -s ours

am skip reason: Merged-In I58bd8b941f6340d9e69153702b5269cc35c646da with SHA-1 0d591fd0a4 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1705148

Change-Id: I199d0152d1e656f093be53fe4f205dc0e6f3288d