am 57686525: Merge "Fix NPE in PhoneAccountSettingsFragment" into mnc-dev

* commit '57686525ac2170c3acc26afe4d3ce7d4ca0ed090':
  Fix NPE in PhoneAccountSettingsFragment