Merge "fs_mgr: adb-remount-test.sh: filter out more administrivia mounts."