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

Change-Id: Ic92ed92c9505b3eb20d7f41a20362829b4ab6192