[automerger skipped] Merge "Fix NPE when a volume is ejected." into mainline-prod am: 8df38ee6a5 -s ours

am skip reason: Change-Id Ic917836be695e191902706b577b75cc06967e914 with SHA-1 2bf49fa9ab is in history

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

Change-Id: Ifd9eb5bc81314397fc52e101ec83e2e0ac8b8c26