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

Change-Id: I467cb5cf67120c60176af2182ee4118d48602aa3