Merge "Move "should call fs_config" check back into adbd." into main am: c793034832 am: fb5e6306bc

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

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