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

Change-Id: I743a9bbcca76af3fc1701d315e7e053b7ebea57e