[automerger skipped] [conflict] Merge "Prioritize system toasts" into tm-dev am: fe7069660e am: 3971cb694f am: df27c91fce -s ours am: cce248b17e -s ours am: f7530e1e59 -s ours

am skip reason: skipped by valiiftime

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

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