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

* commit '3b4526f2514d4eabdc921e26001e96dc983b9837':
  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