[automerger skipped] Merge "Add NR to ServiceState#isLte and rename to...
[automerger skipped] Merge "Add NR to ServiceState#isLte and rename to isPsOnlyTech" am: 381ef279 am: c630d50c am: 952c498b -s ours
am skip reason: Change-Id I7af45d8f49a4f33456dc83c715f460fefe89b5df with SHA-1 61cf3a04 is in history
Change-Id: Ib6094dde953c6bc711c97a49ecb30d8e0c856c4f