Merge "Fix device mapper name clashes on non-A/B devices."
am: 97d1fccd5b

Change-Id: Id47e289674eee3c17f0a267544e75cc48213fcb1