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 am: 0d5e6708

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

Change-Id: Id5d2b3c70e7422e0040a927f3b778beb54bf297c