Merge "camera: Fix double ownership of AidlCameraDeviceCallbacks" into tm-dev