Merge "Upgrade with Device Owner: Allow permission control" into sc-dev