Merge "Skip enabling dm-verity for live GSI when needed"