Merge "Expose remaining READ_PHONE_STATE APIs to carrier apps." into pi-dev