Merge "Detect wedged ContentProviders, treat as ANR." into klp-dev