Merge "Toast: Fix the concurrency problem of mAuthenticator" am: a8438682f7 am: adfda7919a

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

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