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: 29845d53

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



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