Merge "vold: Add nvme disk support"
am: 6054bc3ded

Change-Id: I1e4cfc3eaea77220c132e5e08683576059e8fe15