Merge "fs_mgr: harden adb-remount-test.sh"
am: e7d638a02b

Change-Id: I8edc65b0e8e19e16e2edfd20053f3ef13f948d22