Merge changes from topic "telephony_aosp_cp"

* changes:
  Remove unused system property setting code
  Deflake ServiceStateTracker test and others
  Remove mysterious test logic