Merge "Camera: Fix offline session close locking" am: 82e99e38 am:...

Merge "Camera: Fix offline session close locking" am: 82e99e38 am: a8492aa5 am: 6444b705 am: b34feff8

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



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