Android P Preview 3 (PPP3.180510.008)
Android p preview 2
Merge changes from topic "telephony_aosp_cp"

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