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

Change-Id: I1b05a8f05495b7477f4bac693efa13f6f13af107