[conflict] Merge "Prioritize system toasts" into tm-dev am: fe706966 am: 3971cb69

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



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