Merge "Add S-NSSAI" am: 31f2eb3791 am: af709809e3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46073ec4aaf16ed9099df7f6a357de78d8e44c82