[automerger skipped] Merge "VTS for IRadio AIDL" am: a371db65 -s ours am:...

[automerger skipped] Merge "VTS for IRadio AIDL" am: a371db65 -s ours am: 8d5f5605 -s ours am: 1ddd9c9a -s ours am: 6d1b87f0 -s ours

am skip reason: Merged-In I4ee665519bfd2fc818fb68beee1f158b10e46176 with SHA-1 90c6bf56 is already in history

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

Change-Id: I49a14d9244db2bd6ff215826939bed7610402ca6