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

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

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



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