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

* commit 'ecad7587ace0bb702b33fdc278d6705ff968aac8':
  fs_mgr: Use ro.boot.veritymode