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

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



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