am 6b70083a: am 44318d37: Merge "Fix NPE crash when mPhone is null" into lmp-dev
am 6b70083a: am 44318d37: Merge "Fix NPE crash when mPhone is null" into lmp-dev

* commit '6b70083ac1ec46451ab4b1902c4246a8063831d8':
  Fix NPE crash when mPhone is null

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base