[automerger skipped] Merge "[IRadioConfig] Generating AIDL definitions" am:...

[automerger skipped] Merge "[IRadioConfig] Generating AIDL definitions" am: 3dc7a46c -s ours am: d7c4d516 -s ours am: 0a4d328f -s ours am: 1a98a801 -s ours am: 489c976c -s ours

am skip reason: Merged-In I231f9b2eff50e7a0558dd79e85613b626c7cfb52 with SHA-1 92152ac1 is already in history

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

Change-Id: Id0d2317052d08c56aec574b415305c9fb6518717