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

Merge "Reland "Don't enable jdwp by default on userdebug builds""" am: f3683fca am: a1b0512a am: 59afb30f am: e14b396e am: f973b28a

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



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