Merge "Allow ExternalStorageProvider to access all Android/ dirs" into rvc-dev am: 51f5e20ec1 am: 6a557f65cd am: 77f7ceae07 am: 40f740c760

Change-Id: I1cd41288623e0e09d55cbe413f4d5dfd786254be