Merge "Fix mSession NULL dereference" am: 64a5e99011 am: e1391b7d67

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

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