[automerger skipped] Merge "Add NR to ServiceState#isLte and rename to...
[automerger skipped] Merge "Add NR to ServiceState#isLte and rename to isPsOnlyTech" am: ad189b5e am: 400ee161 am: 5972b964 -s ours
am skip reason: Change-Id Id058d90bc6c4f35c85bc719740bee41865390eb7 with SHA-1 96169ca5 is in history
Change-Id: I116b2ebf9107260d1d69d0a5ab3ef28591e6b5a9