Merge "Update ExternalStorageProvider volumes with StorageEventListener" into rvc-dev am: cdb1ce47f9 am: ca462526e6 am: 5abc8b5b35 am: 569b5aaa8d

Change-Id: I39512ca71673cc813b43e9fffa63508673a9f527