am e3c50a54: am cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)" into gingerbread

Merge commit 'e3c50a5470f64fd99438d6fd985f88d9fe20919a'

* commit 'e3c50a5470f64fd99438d6fd985f88d9fe20919a':
  Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)