Merge "Fix launch flags for channel panel" into sc-dev am: 82fee52083 am: f346e833e9 am: 84b515396f am: 956008279d

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

Change-Id: I4681cb05657a73b62b7343c8a33975f63cb2de3a