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

Change-Id: I06276c91476e21c13b22a0c5f5676452de203deb