[automerger skipped] [conflict] Merge "Prioritize system toasts" into tm-dev...

[automerger skipped] [conflict] Merge "Prioritize system toasts" into tm-dev am: fe706966 am: 3971cb69 am: df27c91f -s ours am: cce248b1 -s ours

am skip reason: skipped by valiiftime

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



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