[automerger skipped] Merge "[Status Bar Refactor] Inject NotificationPanelViewController into CollapsedStatusBarFragment." into sc-v2-dev-plus-aosp am: 3153178eee -s ours

am skip reason: Merged-In I84ef8c7621944d6924775c1fe54178af296a3485 with SHA-1 3652989a71 is already in history

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

Change-Id: Ib792beefffc5cc9251cd5afeedd7fd096e777e06