Merge "fs_mgr: adb-remount-test: non-verity recovery"
am: cbd1af9db0

Change-Id: Ie42901cc81f0bccbfb18fb2457396f8cb8ee97b8