[automerger skipped] Merge "Add S-NSSAI" am: d7d4b0ca85 am: 97f11a3ab2 am: 50d149ecc6 -s ours

am skip reason: Change-Id I8f136937f127ff14fedd790526544d5775010da8 with SHA-1 e0820e5e41 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560540

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ea493c239a2c4346471ae50365fc6f42e30ad04