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

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

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