Merge "camera2ndk: ~ACameraCaptureSession shouldn't hold device lock in ACameraDevice_close()." into qt-qpr1-dev am: a1caf58b77

Change-Id: I8c19a5948c96cb685b95b4ea00e33e7b81fa4328