am 74913572: am 6fb8fe9a: Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)"

* commit '749135722c6edb681fc27fcbab5beba25f938d82':
  StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)