Merge "Expose remaining READ_PHONE_STATE APIs to carrier apps." am: ed3862766b am: 72e0822aca  -s ours
am: d4c1c74d75  -s ours

Change-Id: I8d2845bc678c2af19e66b0eb1b0fc9979afb5ece