Merge "Fix sharing to another profile where an app has multiple targets" into...

Merge "Fix sharing to another profile where an app has multiple targets" into tm-qpr-dev am: 6dae9d46 am: ce7a4f30

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



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