[automerger skipped] Merge "Handle stub volumes in StorageSessionController" am: 6341816b31 am: ac9948da15 am: f6e84e9ff0 -s ours

am skip reason: Change-Id I74caa0c16bd0021c561c599616c53076022aa4de with SHA-1 fad9e3a93c is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536702

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c8a45de3c425ad1984d6f48430897e4d00e2492