Merge "Fix DabTune VTS failure of BroadcastRadio v2.0" am: 715c533436 am: e454440677 am: a26fdc4669

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib0c1d8b11d0b731e68c35ecb01087cc81c4831b2