Merge "Undo hard-coding of READ_PRIVILEGED_PHONE_STATE"