Merge "goldfish: enable metadata encryption" am: c10b940a1f am: 282317a8b1 am: c27553b283

Original change: https://android-review.googlesource.com/c/device/generic/goldfish/+/1456359

Change-Id: I1d43e236a051982abbd5b29d5301f37fddf23297