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

Change-Id: Iabecb89436f845419c87b1fa58550c9efc46d282