am 086f6926: Merge "Check external storage volume ID to ensure media is actually mounted."

* commit '086f6926e70b3269af0bdf66dd8501ebf49469f9':
  Check external storage volume ID to ensure media is actually mounted.