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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc9fef623c014cc825864c09ad68b99a45f4a525