Revert "Use shell permission to query current user"

This reverts commit 95bc8d70679df34e6f0da86361633f28e33e2317.

Reason for revert: Conflict with revert for b/190622577

Change-Id: I993e8da9737634d0cc815cd75b461699170602cc
2 files changed