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

Merge "Don't enable jdwp by default on userdebug builds" am: 3ade15d2 am: 391e8ca7 am: 251978e0 am: 97e39b88 am: 209f25af

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



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