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

Change-Id: Ia3db3bfea00376b718c54e690d0af8101ccb2484