Followup to I1ceb26e5a45f1140f6908250d9950594e2561de3

Pass both encryption provider and volume type explicitly,
in our setup they are not necessarily named the same.

Change-Id: Id13b1589b230d6383863bf147c007d774e61671a
Related-Issue: PRODX-37481
(cherry picked from commit cba2c8bf0214070277faa38b97a8b85fb2f70b9b)
2 files changed