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

* commit '6331781a7507c4c3f86c37781cc715baaaa9814c':
  adb warns on remount when verity is enabled