Merge "fs_mgr: Fix disable-verity for verifyatboot partitions" am: 6bc1d38381 am: ab27993c18
am: 6635787941

Change-Id: I37c2c5d200c4c4fe349fdb32f97e1c1158b762d8