Merge \"Expose external app files/cache dir from FileProvider.\"
am: 2b53fdcd54  -s ours

Change-Id: If928c67dea7ed5fba8fee2253328eeaab0310d07