Merge changes from topic "radio-satellite-v" into udc-dev am: 31de63e8 am: f39165d9

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



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