Merge changes from topic "radio-satellite-v" into udc-dev am: 31de63e897 am: 801a3ad159

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

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