Merge "Change getCurrentPhoneType to SystemApi" into lmp-dev