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

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



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