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

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

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