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

Change-Id: Iadacd64e92c1963b2417bad96838ba2c128ec8cb