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

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

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