Merge "CameraServiceProxy: Add client API level to log metrics"