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

Change-Id: I1a8bde686283af1f467edaeb5c735f6ed1721234