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

Change-Id: I6b413b57485f56cc31091a03dddbd78be4239fa3