Merge "Fix wrong target launches in Chooser." into rvc-qpr-dev am: 14692e3d21

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13157627

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8cda83f18f3f057b139f8218079065987bc1de82