Merge "adb: enable/disable verity expected overlayfs errors."
am: be9c2c0310

Change-Id: If390a592e5d314b31173c5af2b1103ca4d80f1bc