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

Change-Id: I0a3a4dc936b12db9241b5a88b7318e936f326f31