[automerger skipped] Fix getVolumeName with secondary volume issue in MediaStore am: c6cad05edf -s ours

am skip reason: Change-Id I129c49d4fb8d68ad34444abe2dc5c435747a8161 with SHA-1 5bcf805433 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/13277616

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I07e318668cc005a9ec18b0fd14be0e585845eae7