Merge "Fix pip or bubbles is under split divider" into sc-v2-dev am: dded85a1 am: e7a5cdf4

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

Change-Id: I5e9ed729a6768844a3aabb238649a0ffc068b8e9