Merge "Don't use SysUI ScrimController for bubbles" into sc-v2-dev am: 0f7c6bbd4e am: 9fb1499dba

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

Change-Id: I2628dcb2704dfcf0834f10237682256b84aca6d6