Merge "Fix launch flags for channel panel" into sc-dev am: 82fee520 am: 329b5f41 am: f7dbcb83 am: bb2a402e

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

Change-Id: Ia980e15520736c1ac98a0dc5a0f37c0ad0bf2849