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

Change-Id: I24ed73aea4bfe6a645fa902ef9566361805861ce