Merge "Disable activity leak detection by default for userdebug" into oc-dev
am: 956ea5f09d

Change-Id: I71d5feb7f558347ddb21dc53e7a7d5b9eda9db6d