Merge "Fix mounting /data on Virtual A/B devices without metadata encryption."