Merge "Merge "Support getStorageVolume() for synthetic volumes." into rvc-dev am: fd71805e1c am: f7b86769e3" into rvc-d1-dev-plus-aosp