Merge "ServiceUtilities:UidInfo: Fix accepted uid names"