Merge "fs_mgr: fs_mgr_update_verity_state cleanup" am: c35c609961 am: c59a33274f
am: 3c021e1af9

Change-Id: I9be290400c8e9366e201fe0136de7e54c2077f04