Merge "Correctly get uids for per-app network preferences" am: 473ddeaebb am: d9c5536026

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723617

Change-Id: Iaf413208ba0ac560b13f102e8a2308866b97dd3a