Merge "Disable activity leak detection by default for userdebug" into oc-dev am: 956ea5f0 am: 8d189593 am: 0681ebd5 Change-Id: Ic0510ef945839d99ec27857b59e25d4e1cd8a911