Merge "Fix direct share badges when sharing on work/personal profiles" into...

Merge "Fix direct share badges when sharing on work/personal profiles" into sc-qpr1-dev am: b51d58e6

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

Change-Id: I1ac8b7840f29eaa7353b4c744452d428271d6e12