Merge "Correctly get uids for per-app network preferences"