Merge "camera2: Fix getConcurrentCameraIds doc formatting"