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

Change-Id: Ic49aeb48693985d0b2ee38230c9e3a55698d3a83