Merge "fs_mgr: Harden adb-remount-test.sh by ERR trap handler"