[automerger skipped] Merge changes from topic "vintf-broadcastradio" into...

[automerger skipped] Merge changes from topic "vintf-broadcastradio" into sc-v2-dev-plus-aosp am: 8100d826 -s ours am: 0a6851cc -s ours

am skip reason: Merged-In Ia70e8a040cb281f3d0e8fc7f3a8dd25bcd6d09bd with SHA-1 7b346190 is already in history

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

Change-Id: I7e6017a0669dd039c4cd0d58a8d77ed12c6ce96d