Merge "Fix mSession NULL dereference" am: 64a5e99011

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2487975

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