[automerger skipped] Merge "[Status Bar Refactor] Inject NotificationPanelViewController into CollapsedStatusBarFragment." into sc-v2-dev am: 1c78585c -s ours

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

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

Change-Id: I700f936524e46946bfd00e3bf3426e604370b063