Merge "Skip enabling dm-verity for live GSI when needed" am: 941cb7606c
am: 5ac79a8a78

Change-Id: I5338e6a70618433a4af66216e5f20a306da26943