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

Change-Id: Ic0510ef945839d99ec27857b59e25d4e1cd8a911