Merge "DO NOT MERGE Fix bubbles for workprofile" into rvc-qpr-dev am: 215fe701

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

Change-Id: I7bb1c45a9713697f9435041942a0b5b19546e406