Merge "adb warns on remount when verity is enabled" into lmp-mr1-dev
automerge: 3dbcc8b

* commit '3dbcc8b9332cdbaa0dae47a6cae3a043f96262fe':
  adb warns on remount when verity is enabled