Merge "treat eng builds as debuggable, not just userdebug ones" am: 86b572d5

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2271046



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