Merge "Scaffolding for AnnotatedUserHandles testing." into udc-dev am: 0c4e819245

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/22963725

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