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

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



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