Merge "Migrate from Uid to UserHandle" into sc-dev