[automerger skipped] Merge "Add S-NSSAI" am: f9dd93a4 am: 5c021f5a am:...

[automerger skipped] Merge "Add S-NSSAI" am: f9dd93a4 am: 5c021f5a am: a4a94e46 -s ours am: 480c3b7e -s ours

am skip reason: Change-Id I94f41b6165dc6f23299f5385cc53e9d5158b90dc with SHA-1 44595f9e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1559714

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I013269bcb1a8464a1aaf1391cc296f5391496563