Merge "Expose remaining READ_PHONE_STATE and SEND_SMS APIs to carrier apps." into pi-dev am: 2ca77fe976
am: 1bccf3e781

Change-Id: I6bf7f6572d4c0736e7fe4228a8a0e3ea3ead3b54