Merge "Offer to cache ContentResolver-related Bundles." into nyc-dev