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

Change-Id: I91a15b9cdd407036082a366346be8f7f8f64a975