am fbb3f8ca: Merge "Set underlying block device RO when enabling verity"

* commit 'fbb3f8ca499b04c82437155f87c8666cad607c6b':
  Set underlying block device RO when enabling verity