[automerger skipped] Merge "Enable ptrace on userdebug when JDWP is disabled"...

[automerger skipped] Merge "Enable ptrace on userdebug when JDWP is disabled" into udc-qpr-dev am: 7e085bd9 -s ours am: 9d5fb006 -s ours

am skip reason: Merged-In I2fb1aa0aea81400f573b8c2e2fa309b7942d9446 with SHA-1 990b5ec7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24022986



Change-Id: I22cb2d90eabea130b05543e7863f1e393586cddf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>