Merge "Fix Chooser teamfood flag logic" into tm-qpr-dev am: 119667adac

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

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