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: I03e9a18e16431ba66aedb5f3b11eb1c889c3359b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>