Merge "Do SetUpDmVerity only once for the same mount point" am: 24a2c1a70c
am: 52389e07c7

Change-Id: I2866d327fb1d3354c65f3def0154b271f1eb52a4