Check system and phone UID in multiple-user-aware way am: 1879bc3033

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

Change-Id: I94ebe456df45a8c12d75fa39da4d2df71034000a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>