Merge "resolv_integration_test in TEST_MAPPING" am: b621667caa

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2393621

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