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

Merge "Revert "Don't enable jdwp by default on userdebug builds"" am: e6a7509d am: a9cc544d am: 7d4c0fec am: 38333df0 am: 9b60a6d1

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



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