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
am: 4434fb3364

Change-Id: Ia5029540d1b46287b8e38382f31ecddf5f4803e4