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

Merge "Reland "Don't enable jdwp by default on userdebug builds""" am: f3683fca am: a1b0512a am: 59afb30f am: e14b396e

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



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