Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev am: 185244f4

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



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