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 am: 6aef74e9

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

Change-Id: I2764c400823ab22b7934199c2f52625eef9da686