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

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

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