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

Change-Id: Iafbb737f13dff658d8a9a77e42bd952c09ddb4db