Merge "Disable ptrace debugging by default on userdebug" into udc-qpr-dev