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 am: f0027983

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



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