Merge "fs_mgr: avb check avb_slot_data" am: 72c06c5f68 am: 238dc3b524
am: dfb324fe96

Change-Id: I51c9a5b6c63bc4ffff6e4eed6e1091e7b5bd8247