Merge "Revert "Don't enable jdwp by default on userdebug builds"" am: e6a7509d

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



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