Merge "A payload re-selection test" into tm-qpr-dev am: 3a9ca304f4

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

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