Merge "Don't enable jdwp by default on userdebug builds" am: 3ade15d2

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



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