Android Wear Hematite Developer Preview 2 (PWH1.180422.008)
Merge changes from topic "telephony_aosp_cp"

* changes:
  Remove time compensation for bad NITZ offset info
  Make the NitzStateMachine behavior more regular