Merge "fs_mgr_verity: fix androidboot.veritymode=enforcing doesn't work" into oc-dev
am: 5f68b422bd

Change-Id: Ib27c377f2e02d30e0af219a2f08f90087ec11e51