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

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



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