[automerger skipped] Merge "Add S-NSSAI" am: d7d4b0ca am: 97f11a3a am: 50d149ec -s ours am: 443fe5fe -s ours am: b273ca5e -s ours

am skip reason: Merged-In I8f136937f127ff14fedd790526544d5775010da8 with SHA-1 e0820e5e is already in history

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

Change-Id: I51f838267300bfe623c8bbb93d4a46adfe3c61eb