am 364fc14f: Merge "Detect wedged ContentProviders, treat as ANR." into klp-dev

* commit '364fc14f544712a2d32cc0f32e84dfe4127376a6':
  Detect wedged ContentProviders, treat as ANR.