am 15369c6c: Merge "Fix volume naming when surfaced over MTP." into mnc-dev
am 15369c6c: Merge "Fix volume naming when surfaced over MTP." into mnc-dev

* commit '15369c6c3ba50a852ed0c499eb5929436cffa005':
  Fix volume naming when surfaced over MTP.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base