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

* commit '135e380f349f4100dd6cbdad1281c5072a2463d3':
  Fix NPE in PhoneAccountSettingsFragment