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

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

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