Merge "Remove usage of SET_TIME permission"