Merge "Add 5G NSA status to ServiceSate"
am: c49ec8d1e7

Change-Id: I21ac574bb169be8bd1980129b3a4a648bbc4d07a