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