Merge "adbd: Automatically disable verity in adb remount." am: 22a8462336 am: 7342d7ec1c
am: 4837bd1304

Change-Id: I3946ab900cdc013321a36b3628951384831ea550