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

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