Merge "Enable ptrace on userdebug when JDWP is disabled" into udc-qpr-dev