Merge "[Status Bar Refactor] In CollapsedStatusBarFragment, use NotificationPanelViewController instead of StatusBar.java." into sc-v2-dev am: 0574e37a74

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

Change-Id: Ibc716938b8f650196844a5023323d1bf689ec815