Merge "Camera: Call corresponding unlock for every lockAsync" am: 2ac8ac5ac2 am: 555cca1130 am: cb453824a3

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

Change-Id: If072b3de55c681931840af5d5ac90388e317c41a