Merge "adbd: Automatically disable verity in adb remount."
am: 22a8462336

Change-Id: Ib9c65a95cf7cf2133ebedab4d509db83a6ebe0af