Merge "Add null pointer check for mConfig in onSessionLost" am: 9fe8fcdb37

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

Change-Id: I5c5f42e2febe9770a37ec56083bfa9d796713d50