Merge "[conflict] Merge "Fix mSession NULL dereference" am: 64a5e990 am:...

Merge "[conflict] Merge "Fix mSession NULL dereference" am: 64a5e990 am: e1391b7d am: 2f92d85e" into udc-dev am: 7f7048c5

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



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