Merge "Add S-NSSAI" am: d7d4b0ca85 am: 97f11a3ab2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia91f2b4ad353e8bab68e01a857d3387e4b5a4c00