am 26207b53: Merge "Change getCurrentPhoneType to SystemApi" into lmp-dev

* commit '26207b53a82f1e8f3d72eaf36bd69dbcb06833fc':
  Change getCurrentPhoneType to SystemApi