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