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

Change-Id: I972021f6c25d65cfafc3e7a51672bb0b01c7e3c2