Merge "Fix launch flags for channel panel" into sc-dev am: 82fee520 am: f346e833 am: 84b51539 am: 95600827

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

Change-Id: I4681cb05657a73b62b7343c8a33975f63cb2de3a