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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I61de05f8b4b8642d41573f408e02d818c898f052