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

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

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

Change-Id: I63e569b48170dc4f1ad7d8a1cc0890473a680b17