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

Change-Id: I075c96eff7910c7a68c295ecf5f887b9deb929c0