Merge "Camera: Fix offline session close locking" am: 82e99e3884

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

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