Merge "Expose remaining READ_PHONE_STATE APIs to carrier apps."
am: ed3862766b

Change-Id: I5c60ed5f5f9b305881d1e0c9db09c8631e1966bf