Merge "Toast: Solve the NPE problem in session.java" am: 14487f24c6 am: 8592d3c3d3 am: 04d5236e9e

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

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