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: I664f0b23f1da1f2b97e7c6df1232b6a2d2be2130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>