Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)"