Merge changes from topic "telephony_aosp_cp"

* changes:
  Switch MccTable over to using TimeServiceHelper
  Make NitzStateMachine testable
  Pull out NITZ-related logic into a separate class
  Clarify bogus NITZ correction logic / correction
  Extract low level NITZ parsing logic
  Remove unnecessary overriding capability
  Use Android data for MCC-based time zone lookup