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

Change-Id: I4f985f7a7139b70afa594aa0248190cc533bbd2d