Merge "fs_mgr: Don't parse encryption options, just keep string"
am: 51c41e94d9

Change-Id: I31b21da5b2c19bd489099b68c2f03d25dad431e9