Merge "Fix channel panel UI on 3 button nav devices" into udc-dev am: 6c7a1524

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



Change-Id: I5f156185c0f3976fa2c05a7d6d280b43531d8738
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>