am 3aa700e6: am 622d44d8: am fbb3f8ca: Merge "Set underlying block device RO when enabling verity"

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