Merge "Add S-NSSAI" am: 31f2eb3791

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1441c19bf803ca0ba2b49d19679037328246dc65