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

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

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