Merge "Revert "adb: Do not use fs_config unless we are root (try 2)."" into main am: 8054f5e2

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3018727



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