Merge "Only show the channel toast if users expressly ask for it" into...

Merge "Only show the channel toast if users expressly ask for it" into tm-qpr-dev am: 45bcb214 am: 197091ca

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



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