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

am skip reason: skipped by valiiftime

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

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