Merge "Fix testUidPoliciesToString"