Revert VolumeProvider API changes

Bug: 119539695
Test: build
Change-Id: I57e204bb25501448e3bdf67e59c8e5b696d5b191
2 files changed