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

Change-Id: I808ffa081b79a1e82652b749fbc227a0c892a01c