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

Change-Id: Id59737a315540e80c628cfe3a42093e8e2646732