Merge "cameraserver: Fix stream specific HAL buffer manager for HIDL devices" into main