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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44639346c19e19edd7de37cd4af5f959d2269eea