Merge "fs_mgr_verity: fix androidboot.veritymode=enforcing doesn't work"
am: 6019991c6e

Change-Id: Id35e60c6f00414d4e71cdc8e670d73c5daa74fbf