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: 082e54a5

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

Change-Id: I2c8ee02d71e23f50e60f926fb709245bb41c94a3