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

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



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