[automerger skipped] Merge "Add 5G NSA status to ServiceSate" am: c49ec8d1e7 am: c7b58deca1
am: 514277f4cd  -s ours

Change-Id: Ief3ab3845002d1617a747156a1207149560f5035