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

Change-Id: I7dda91224724203d9bf7a7064d6a9d83781936d5