Merge "Use shell permission to query current user" am: dbb2a23a38 am: 7252278df7

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

Change-Id: I7305bb57bc7218f2dd110a02324649287faed007