Merge "resolv_integration_test in TEST_MAPPING" am: b621667caa am: 2a5e0152df am: 46d109ecb1

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

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