Merge "Add an API to getPhoneAccountHandle for a TelephonyManager" into sc-dev