Merge "Revert "Return enrollment consent status to caller."" into sc-dev