Merge "Update check for isFullVolumeDevice" into stage-aosp-sc-ts-dev