am 7a497e3b: Merge "adb warns on remount when verity is enabled"

* commit '7a497e3b5cc8aee61c5fa3e323d322f68a13c5b2':
  adb warns on remount when verity is enabled