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

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



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