Merge "Enable ptrace on userdebug when JDWP is disabled" into main am:...

Merge "Enable ptrace on userdebug when JDWP is disabled" into main am: e59b7500 am: ef0fcdb1 am: d75cd149 am: 42f2b59a am: 637d7581

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



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