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

Change-Id: I8a24342b3c444072cc4cdcd8331fc7d78c804438