Merge "Merge "Wire display context for text toasts" into tm-dev am: ca6ef912...

Merge "Merge "Wire display context for text toasts" into tm-dev am: ca6ef912 am: 7bb2e736 am: 8f9b4c10" into tm-qpr-dev-plus-aosp am: 3574aa57

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



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