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

Change-Id: Ifd1a1fee79b101c566de5fac12a083fdc267da5d