Merge "adb warns on remount when verity is enabled" into lmp-mr1-dev