[automerger skipped] Merge "Add S-NSSAI" am: 31f2eb37 am: af709809 am:...

[automerger skipped] Merge "Add S-NSSAI" am: 31f2eb37 am: af709809 am: a4f1c830 -s ours am: c186481f -s ours

am skip reason: Change-Id I8d2c55bece07c599cb7d1ac0d16ad85c0acdeae5 with SHA-1 85169ab8 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7c91d0082d999fc266ee06284a50865cde55ff7f