Merge "Update ExternalStorageProvider volumes with StorageEventListener" into rvc-dev am: cdb1ce47f9

Change-Id: I1bcab5b88315548ff1f4b56de6b1be80c71039ad