Merge "Remove fixed grant of READ_PHONE_STATE and cleanup" into sc-dev