Merge "Fix direct share badges when sharing on work/personal profiles" into sc-qpr1-dev am: b51d58e6fd am: 0d5e670809 am: 6f87f6c3e6

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

Change-Id: I42d1724d8c892e0e9dba196eff6ec21cd3b3f3b5