Merge "Camera: Fix deadlock caused by mBatchLock" into sc-dev am: da21f77c am: c9ce8ca4 am: 635c8a76

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

Change-Id: I462b9199284c2b8e0fb081183af563dd690e0eb6