am e8f0971c: am 4f8fa5ba: Merge "Fix disable-verity when the underlying block device is RO"

* commit 'e8f0971cc852ecf4220cdcde01167b8f4f384f17':
  Fix disable-verity when the underlying block device is RO