Merge "Reland "Don't enable jdwp by default on userdebug builds"""