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

Change-Id: I2e3cb4963f3a4532a63d4c847914ee9b1fc51c28