Merge "Allow fscrypt_mount_metadata_encrypted to be called more than once" am: 69199c70ec am: c39c12d0c3 am: 4f2f5d03b1

Change-Id: Ic40fd05dd91509c1a53488d9758c9fa39a7e0b84