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: Iab98e9f744d06532d382f71cd07d39a8f7f2cfe5