Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev...

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

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



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