[automerger skipped] Merge "IRadio 1.6: Public Key Type For IMSI Encryption" am: 20a99acbfb am: f74dc4e71a am: 79a8c568e7 -s ours

am skip reason: Change-Id Id11055354b32e492e24f43b348bdf2745d63529c with SHA-1 10ca7b1d5b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81b7a498855996dc59d062358c8cba6318bc60d5