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

Change-Id: I8d68833469bf09d843344be2cdce426f7575f4d3