[automerger skipped] Merge "[Status Bar Refactor] In...

[automerger skipped] Merge "[Status Bar Refactor] In CollapsedStatusBarFragment, use NotificationPanelViewController instead of StatusBar.java." into sc-v2-dev am: 0574e37a am: 9404eb15 -s ours

am skip reason: Merged-In I021d5d1bb211cf8a8cadad0a202a05566c78ce46 with SHA-1 8b67be84 is already in history

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

Change-Id: I804a4dcedeafb6610d1ff4560a5f13c8d41d5f14