Merge "Fix launch flags for channel panel" into sc-dev am: 82fee52083

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15498277

Change-Id: I05ce4cf13fca889c18a2442f891bec8cb1b05d6e