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

* commit '0dc5409cb5ee5493f305b2f0237369b6b17aabac':
  Change getCurrentPhoneType to SystemApi