Merge "Revert "Add method to enforce READ_PRECISE_PHONE_STATE permission""