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

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



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