tree 380100e64294d71e8e94b8b6a4716247dacb4553
parent e153c1632064ce50e21c1c4d10be73c2a0ca0e06
parent d7d4b0ca85f3e12e8884cba997042bb309f25d45
author Daniel Bright <dbright@google.com> 1611774219 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1611774219 +0000

Merge "Add S-NSSAI" am: d7d4b0ca85

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ae9b7dad9d7fb8f4f883bbf23f63e041a534200