Merge "Add NR to ServiceState#isLte and rename to isPsOnlyTech" am: ad189b5e60

Change-Id: I213587114b84db9a5faed350d2fda5df3f4d8c7a