[conflict] Merge "Fix mSession NULL dereference" am: 64a5e990 am: e1391b7d am: 2f92d85e

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



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