Merge "resolver: get custom resolver activity" into android13-tests-dev am: 7ebb4030db

Original change: https://android-review.googlesource.com/c/platform/cts/+/2438980

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