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

Merge "Fix launch flags for channel panel" into sc-dev am: 82fee520 am: f346e833 am: e7a555d9 am: 8be87a7d

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

Change-Id: Ic3f221d15c98832c63bcd1da726c6e723a23cbf7