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 rvc-dev am: 59a63e80 am: eec74eb4

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



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