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