Merge "Enable metadata encryption for userdata_gsi." am: cb13a7766e
am: b729fe143a

Change-Id: I840f8c5ff711aecb9ea2e6989e7328bf370ec380