Merge "Fix: BroadcastradioHalTest.DabTune case failure am: 58eeec5925 am: c9fa6a8ef3" am: c8420d0269 am: 078222e5a6

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

Change-Id: Ia189d3e03a781b0468575dd89105181e5ed13b41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>