Merge "docs: Added note in getCacheDir() that developers can use directory obtained from getExternalCacheDir() to store app caches larger than 1 MB. am: e9681e192a am: ba65a92855" into nyc-mr1-dev-plus-aosp
am: a294ef4f57

Change-Id: If4f051f7ef6f28b4df51326b5d5756703e03bd9a