Merge "Fix an issue with bubbles overlapping the taskbar" into sc-v2-dev am: 99ce862e47 am: 337d25b270

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

Change-Id: I39d118a502de4581bae2acdca9cc0e3f610d52ae