Merge "Fix mounting /data on Virtual A/B devices without metadata encryption." am: 21394f6e85 am: 3f52b42db0 am: 593c5eb8cb

Change-Id: Ib268eff0da9c5c4119924d9a5ff50599e4d59527