Merge "Enable metadata encryption for userdata_gsi." am: 99046b75c4 am: 8b90acafcd
am: 1f4307e51e

Change-Id: If3e65d967a99e3f757a1ab978067e61a3faeae66