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

Change-Id: I0e61e9ccb2690d6838316bba0a1437a13b1ee8fc