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

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

Change-Id: I8a019cc8925ae4abc7e64247aa3cef69b558ce3d