am 4e359e1d: Merge "fs_mgr: Use ro.boot.veritymode"

* commit '4e359e1da351e1a99e789bc7a9f7e4da0d1fab27':
  fs_mgr: Use ro.boot.veritymode