Merge "Scale back channel toast" into tm-qpr-dev am: 99a5adfa am: f030ca68

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19414383



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