Merge "[2/2] Fix sharing to another profile where an app has multiple targets" into tm-qpr-dev am: dd4fc6db67

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

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